From: Jon Nettleton <jon.nettleton@gmail.com>
Date: Mon, 7 Sep 2009 15:06:50 +0000 (-0700)
Subject: Convert on_tree_changed to a gboolean returning false.
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10958
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7f88e02a269018afddacec41e70cccf4e6d443fa;p=gnome-shell.git

Convert on_tree_changed to a gboolean returning false.

This fixes commit 0a29cf61955935ca1e7d3a48ccd38164ec9c80af and
g_timer_add_full running in an endless loop.

http://bugzilla.gnome.org/show_bug.cgi?id=592608
---

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index b090910ef..dfdc828a0 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -57,7 +57,7 @@ struct _ShellAppSystemPrivate {
 };
 
 static void shell_app_system_finalize (GObject *object);
-static void on_tree_changed (gpointer user_data);
+static gboolean on_tree_changed (gpointer user_data);
 static void on_tree_changed_cb (GMenuTree *tree, gpointer user_data);
 static void reread_menus (ShellAppSystem *self);
 static void on_favorite_apps_changed (GConfClient *client, guint id, GConfEntry *entry, gpointer user_data);
@@ -415,13 +415,14 @@ reread_menus (ShellAppSystem *self)
   cache_by_id (self, self->priv->cached_settings, TRUE);
 }
 
-static void
+static gboolean
 on_tree_changed (gpointer user_data)
 {
   ShellAppSystem *self = SHELL_APP_SYSTEM (user_data);
   g_signal_emit (self, signals[INSTALLED_CHANGED], 0);
   reread_menus (self);
   self->priv->app_change_timeout_id = 0;
+  return FALSE;
 }
 
 static void